use object tree to cleanup UpgradeCheck, UpgradeCheck::manager_ and (#692)

UpgradeCheck::replyId.

diff --git a/gui/main.cc b/gui/main.cc
index 87a4a3fdc3e557fdb117ca575480d0d29f488f03..cb204d1599bec45015e8facfa9bb0d24dbe121dd 100644 (file)
--- a/gui/main.cc
+++ b/gui/main.cc
@@ -44,7 +44,5 @@ int main(int argc, char** argv)
 
   MainWindow mainWindow(nullptr);
   mainWindow.show();
-  QApplication::exec();
-
-  return 0;
+  return QApplication::exec();
 }

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index cb85045d58f126c40a57ffcd869681740c8b37b6..1c5af45af4be9837edd369557712126c389bd9bf 100644 (file)
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -232,7 +232,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   //--- Restore from registry
   restoreSettings();
 
-  upgrade = new UpgradeCheck(parent, formatList_, babelData_);
+  upgrade = new UpgradeCheck(this, formatList_, babelData_);
   if (babelData_.startupVersionCheck_) {
     upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
                              allowBetaUpgrades());
@@ -246,14 +246,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   }
 }
 
-//------------------------------------------------------------------------
-MainWindow::~MainWindow()
-{
-
-  delete upgrade;
-
-}
-
 //------------------------------------------------------------------------
 // Called every time, when a menu entry of the language menu is called
 void MainWindow::slotLanguageChanged(QAction* action)
@@ -1048,8 +1040,6 @@ void MainWindow::closeActionX()
     babelData_.donateSplashed_ = now;
   }
   saveSettings();
-  delete upgrade;
-  upgrade = nullptr;
   qApp->exit(0);
 }
 

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 51a0dd7283652177a5b3528447d3e448f0fc7946..c3539a502ec37e2fb0337737ba3848213036390b 100644 (file)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -53,7 +53,6 @@ class MainWindow: public QMainWindow
 
 public:
   MainWindow(QWidget* parent);
-  ~MainWindow();
 
 
 private:

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index ecb796ce7c5fae0b9625462f1216c8cde073f001..5674a08aca636163658379e76e556befa1e2d373 100644 (file)
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -61,18 +61,6 @@ UpgradeCheck::UpgradeCheck(QWidget* parent, QList<Format>& formatList,
 {
 }
 
-UpgradeCheck::~UpgradeCheck()
-{
-  if (replyId_ != nullptr) {
-    replyId_->abort();
-    replyId_ = nullptr;
-  }
-  if (manager_ != nullptr) {
-    delete manager_;
-    manager_ = nullptr;
-  }
-}
-
 bool UpgradeCheck::isTestMode()
 {
   return testing;
@@ -96,11 +84,11 @@ QString UpgradeCheck::getCpuArchitecture()
 }
 
 UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(
-  const QString& currentVersionIn,
+  const QString& currentVersion,
   const QDateTime& lastCheckTime,
   bool allowBeta)
 {
-  currentVersion_ = currentVersionIn;
+  currentVersion_ = currentVersion;
 
   QDateTime soonestCheckTime = lastCheckTime.addDays(1);
   if (!testing && QDateTime::currentDateTime() < soonestCheckTime) {
@@ -108,7 +96,7 @@ UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(
     return updateUnknown;
   }
 
-  manager_ = new QNetworkAccessManager;
+  manager_ = new QNetworkAccessManager(this);
 
   connect(manager_, &QNetworkAccessManager::finished,
           this, &UpgradeCheck::httpRequestFinished);

diff --git a/gui/upgrade.h b/gui/upgrade.h
index 64f07f76a539c55427cc53a6a2c3cf4c0e58b5ab..e9984a2d40e4c463db52ce44219b12a8850f2ee8 100644 (file)
--- a/gui/upgrade.h
+++ b/gui/upgrade.h
@@ -36,7 +36,6 @@ class UpgradeCheck : public QObject
   Q_OBJECT
 public:
   UpgradeCheck(QWidget* parent, QList<Format>& formatList, BabelData& bd);
-  ~UpgradeCheck();
 
   enum updateStatus {
     updateUnknown,
@@ -44,15 +43,13 @@ public:
     updateNeeded,
   };
 
-  UpgradeCheck::updateStatus checkForUpgrade(const QString& babelVersion,
+  UpgradeCheck::updateStatus checkForUpgrade(const QString& currentVersion,
       const QDateTime& lastCheckTime,
       bool allowBeta);
   QDateTime getUpgradeWarningTime();
   UpgradeCheck::updateStatus getStatus();
   static bool isTestMode();
 
-protected:
-
 private:
   QString currentVersion_;
   QNetworkAccessManager* manager_;
@@ -64,15 +61,14 @@ private:
   updateStatus updateStatus_;
   BabelData& babelData_;
 
-  QString getOsName();
-  QString getOsVersion();
-  QString getCpuArchitecture();
-  bool suggestUpgrade(const QString& from, const QString& to);
+  static QString getOsName();
+  static QString getOsVersion();
+  static QString getCpuArchitecture();
+  static bool suggestUpgrade(const QString& from, const QString& to);
 
 private slots:
   void httpRequestFinished(QNetworkReply* reply);
 
-
 };
 
 #endif // UPGRADE_H